*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25a7a618c4160896cdba8161f64821c3dbffc1d9..a473edeedeb555e8eac30ee3d5296d5f930e325f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-25  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+       * progmodes/sh-script.el (sh-builtins): Add bash `shopt' builtin.
+       (sh-font-lock-keywords, sh-feature): Fix previous change of
+       sh-feature to avoid infloop with sh-font-lock-keywords.
+
 2003-09-25  Kim F. Storm  <storm@cua.dk>
 
        * frame.el (frame-current-scroll-bars): New defun.